Fix for skipped steps