Fix Step in controller