Fixed behaviour when disabled