Bug fixing - drawing