diff --git a/uppsrc/Core/Convert.cpp b/uppsrc/Core/Convert.cpp
index 4aac022e9..5c5cb8938 100644
--- a/uppsrc/Core/Convert.cpp
+++ b/uppsrc/Core/Convert.cpp
@@ -380,7 +380,7 @@ Value ConvertDouble::Scan(const Value& txt) const {
 
 int   ConvertDouble::Filter(int chr) const {
 	chr = CharFilterDouble(chr);
-	return comma && chr == '.' ? ',' : chr;		
+	return comma && chr == '.' ? ',' : chr;
 }
 
 ConvertDouble::ConvertDouble(double minval, double maxval, bool notnull)
diff --git a/uppsrc/CtrlCore/Win32Clip.cpp b/uppsrc/CtrlCore/Win32Clip.cpp
index eeadd947a..de303db5a 100644
--- a/uppsrc/CtrlCore/Win32Clip.cpp
+++ b/uppsrc/CtrlCore/Win32Clip.cpp
@@ -315,7 +315,10 @@ String ReadClipboardText()
 #ifdef PLATFORM_WINCE
 	return ReadClipboardUnicodeText().ToString();
 #else
-	String s = ReadClipboard((const char *)CF_TEXT);
+	String s = ReadClipboardUnicodeText().ToString();
+	if(s.GetCount())
+		return s;
+	s = ReadClipboard((const char *)CF_TEXT);
 	return String(s, (int)strlen(~s));
 #endif
 }