iterate and fix