minor optimization for slow network environment