Correct draw issue