Avoiding the disabling bug