bugfix refractoring executeStep