Fixed insert step method bugs