Update/fix ScreenSteps
Merge pull request #3187 from alebcay/screensteps

Update/fix ScreenSteps