Hotfix: gateway :none if nil