Fix problems for multi-steps