fix support for pre/post-step callbacks