Fix issue with drawing