Fixed deprecated move_iter()