Improve "Disable" logic