Make change to handle Hubiquitus 0.9 GateWay