Finally fixed drawing bug I think