Load balancing fix by Salah