spikes issues fixed