Provisional fix for UI lag