Fix the way disabled is dealt with.