Another fix for the navigateToStep: method (still needs testing)