Fix XBeeBinding