Front-end host fix #3