Working steps corrections