Fix for host randomization