Quick HostBasedHandler fix