Better quick fix for hostname