Forgot a few things to fix for iterative mode