fix GatewaySupport class