spark [xaviersobased]

Remedy (@remedling)