Bug fix on next when disabled