High framerate problem wasn't fully fixed, let's try this again.

Little addition to 7891a2f0113d8.