Restored missed gateway mode check.