diff --git a/Adamant/AppDelegate.swift b/Adamant/AppDelegate.swift
index 8ea860eb6..734246a07 100644
--- a/Adamant/AppDelegate.swift
+++ b/Adamant/AppDelegate.swift
@@ -38,9 +38,7 @@ struct AdamantResources {
 	static let nodes: [Node] = [
 		Node(scheme: .https, host: "endless.adamant.im", port: nil),
 		Node(scheme: .https, host: "clown.adamant.im", port: nil),
-		Node(scheme: .https, host: "lake.adamant.im", port: nil),
-		Node(scheme: .https, host: "158.69.59.45", port: nil),
-		Node(scheme: .https, host: "54.36.183.233", port: nil)
+		Node(scheme: .https, host: "lake.adamant.im", port: nil)
 	]
 	
 	static let iosAppSupportEmail = "ios@adamant.im"
diff --git a/Adamant/Info.plist b/Adamant/Info.plist
index 27c849224..40f76ae09 100644
--- a/Adamant/Info.plist
+++ b/Adamant/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.3.12</string>
 	<key>CFBundleVersion</key>
-	<string>30</string>
+	<string>31</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>
diff --git a/Adamant/Stories/NodesEditor/NodeEditorViewController.swift b/Adamant/Stories/NodesEditor/NodeEditorViewController.swift
index 083238eda..6926ce244 100644
--- a/Adamant/Stories/NodesEditor/NodeEditorViewController.swift
+++ b/Adamant/Stories/NodesEditor/NodeEditorViewController.swift
@@ -231,7 +231,29 @@ class NodeEditorViewController: FormViewController {
 // MARK: - Actions
 extension NodeEditorViewController {
 	func testNode(completion: ((Bool) -> Void)? = nil) {
-		guard let url = node?.asURL() else {
+		var components = URLComponents()
+		
+		// Host
+		if let row: TextRow = form.rowBy(tag: Rows.host.tag), let host = row.value {
+			components.host = host
+		}
+		
+		// Scheme
+		if let row = form.rowBy(tag: Rows.scheme.tag), let scheme = row.baseValue as? URLScheme {
+			components.scheme = scheme.rawValue
+		} else {
+			components.scheme = "https"
+		}
+		
+		// Port
+		if let row: IntRow = form.rowBy(tag: Rows.port.tag), let port = row.value {
+			components.port = port
+		}
+		
+		let url: URL
+		do {
+			url = try components.asURL()
+		} catch {
 			testState = .failed
 			dialogService.showWarning(withMessage: String.adamantLocalized.nodesEditor.failedToBuildURL)
 			return