Fix Rendering Issues!

One Year later it's finally fixed!