#240 Completed server side fallback for steps.