spot-form bug first fix