Fix drawing bug. It is working!