Fixed and improved disabling