Draw fix