temporary fix for slowdown