Fixing canonical host