Fix drawing issues! :D