Need to add fix for hostname -> 127.0.0.1 mapping