Tracking changes to host fixes #27