HXP.choose Fix #156