Fix recursive disabling