#2 Fixing that bug with bad rendering