more complete fix for disabled state