Bugfix in Step first