Bug fix remove spikes