Preemptive bug fix