Get skipped steps working properly