temp band aid fix for perf issues