fix for repeated disabling