Fixed problem with step and trace mode.