Improved check during draw