Improved disabled state