Fixed None gateway issue