Fix default host behaviour