Fix rendering problem (this time for good)