Fixing a bug with the host