diff --git a/src/baseexpression.cpp b/src/baseexpression.cpp
index be1f0a3..d658d9e 100644
--- a/src/baseexpression.cpp
+++ b/src/baseexpression.cpp
@@ -566,12 +566,7 @@ void BaseExpression::esc(const PT::Space & space, PT::TextStream & stream)
 {
 	PT::WTextStream tmp_stream;
 
-	if( space.table.size() > 0 )
-	{
-		tmp_stream.clear();
-	}
-
-	space.Serialize(tmp_stream, true);
+	space.serialize_to_space_stream(tmp_stream, true);
 	esc(tmp_stream, stream);
 }
 
diff --git a/src/clearer.cpp b/src/clearer.cpp
index 3075547..a50c02e 100644
--- a/src/clearer.cpp
+++ b/src/clearer.cpp
@@ -141,7 +141,7 @@ void Clearer::clear_value(PT::Date & field_value)
 
 void Clearer::clear_value(PT::Space & field_value)
 {
-	field_value.Clear();
+	field_value.clear();
 }
 
 void Clearer::clear_model(Model & field_value)
diff --git a/src/dbconnector.cpp b/src/dbconnector.cpp
index b19c040..5ac3d06 100644
--- a/src/dbconnector.cpp
+++ b/src/dbconnector.cpp
@@ -430,16 +430,16 @@ void DbConnector::get_value(const char * value_str, PT::Date & field_value)
 
 void DbConnector::get_value(const char * value_str, PT::Space & field_value)
 {
-	field_value.Clear();
+	field_value.clear();
 
 	if( *value_str != '\0' )
 	{
 		PT::SpaceParser space_parser;
 		space_parser.SetSpace(field_value);
 
-		if( space_parser.ParseString(value_str) != PT::SpaceParser::ok )
+		if( space_parser.ParseSpace(value_str) != PT::SpaceParser::ok )
 		{
-			field_value.Clear();
+			field_value.clear();
 
 			if( log )
 			{