Fix for load test