Fix merged based on Alona and Martin's reviews.

It seems to do the trick with my testing on my local engine, let's hope that's really it.