Revert onDisable iterator - it works!