iterative fixes