Implement workaround for slow air-user performance