adapt step action/command related code regarding issue #62