Fix for HOST