GENICLOUD-31 Fix gateway variable not being set properly.