Finally fix ondisable loop.