Hopeful fix for weird latency issue