diff --git a/main.cpp b/main.cpp
index dad0c486..0888af43 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,30 +7,9 @@ void print(PIConfig::Entry*e, PIString indent = "") {
 }
 
 int main() {
-	//piCout << __sysoemname__;
-	const char * s = "Eng, Русский №!123";
-	PIString str = PIString::fromUTF8(s);
-	//piCout << PIChar::fromUTF8("a").isDigit();
-	//piCout << PIChar::fromUTF8("1").isDigit();
-	piCout << PIChar::fromUTF8("щ") << PIChar::fromUTF8("щ").isLower() << PIChar::fromUTF8("щ").isUpper();
-	piCout << PIChar::fromUTF8("Ц") << PIChar::fromUTF8("Ц").isLower() << PIChar::fromUTF8("Ц").isUpper();
-
-	//piCout << str;
-	//piCout << str.toLowerCase();
-	//piCout << str.toUpperCase();
-	/*str.forEach([](PIChar c){piCout << c; return c;});
-	PIFile f("1.txt", PIIODevice::ReadWrite);
-	f.clear();
-	f << str;
-	PIChar c = PIChar::fromUTF8("│");
-	PIString s = PIString::fromUTF8("│");
-	piCout << c.unicode16Code() << s[0].unicode16Code();
-	piCout << c << s << PISystemInfo::machineKey();
-	PIFile f("1.txt", PIIODevice::ReadWrite);
-	f.clear();
-	f << c;*/
-
-	//PIConfig conf("spec_core.conf", PIIODevice::ReadOnly);
-	//print(&conf.rootEntry());
+    PIStringList dl = PISerial::availableDevices();
+    piCout << dl;
+    PISerial ser(dl[0]);
+    piCout << ser.open(PIIODevice::ReadWrite) << &ser;
 	return 0;
 }
diff --git a/src_main/io_devices/piserial.cpp b/src_main/io_devices/piserial.cpp
index 514309aa..521ef7bc 100755
--- a/src_main/io_devices/piserial.cpp
+++ b/src_main/io_devices/piserial.cpp
@@ -822,7 +822,7 @@ PIStringList PISerial::availableDevices(bool test) {
 #      ifdef FREE_BSD
 	prefixes << "cu";
 #      endif
-#      ifdef APPLE
+#      ifdef MAC_OS
 	prefixes.clear();
 	prefixes << "cu." << "tty.";
 #      endif
@@ -851,8 +851,8 @@ PIStringList PISerial::availableDevices(bool test) {
 	PIVector<PIFile::FileInfo> de = dir.entries();
 	piForeachC (PIFile::FileInfo & e, de) { // TODO changes in FileInfo
 		piForeachC (PIString & p, prefixes) {
-			if (e.name().left(p.size_s()) != p) continue;
-			dl << e.path;
+			if (e.name().startsWith(p))
+			    dl << e.path;
 		}
 	}
 #  endif