Disabling works properly now