diff --git a/src/baseexpression.cpp b/src/baseexpression.cpp
index 30260aa..370fa9b 100644
--- a/src/baseexpression.cpp
+++ b/src/baseexpression.cpp
@@ -172,7 +172,7 @@ void BaseExpression::field_after()
 
 void BaseExpression::put_field_name_and_table_if_needed(const wchar_t * field_name, const FT & field_type, ModelEnv * model_env)
 {
-	if( use_prefix && model_env )
+	if( !field_type.is_raw_field_name() && use_prefix && model_env )
 	{
 		if( !is_empty_field(model_env->table2_name) )
 		{