fixed host-side and trying to fix board-side