Fix for problem where the first step displays the wrong data.
Merge remote-tracking branch 'origin/master'