Improved checking of steps