Added workaround for slow requests