Perf tune after bug fix