Guard against N_steps != 1
#51
+56
−4
Merged
N_steps != 1
#51