Fix the memory spikes