Fix bug with GatewayInfo model