Bugfix with host