fix in iterating