Fix done for Drawing