Flicker is fixed!

Now to see if anything goes horribly wrong due to the fix...