Fixing Step/Continue