fix for gateway name