Improved checking