Fixes return of host