bug fix causing high load