Fix for loadbalanced environments