Fix error when switching btw Hap and HapQ