Fix bug with order steps