Index: BasicCompiler32/Compile_Func.cpp
===================================================================
--- BasicCompiler32/Compile_Func.cpp	(revision 116)
+++ BasicCompiler32/Compile_Func.cpp	(revision 117)
@@ -176,6 +176,5 @@
 		tempParm=temp2;
 
-		extern const CClass *pobj_StringClass;
-		type.SetType( DEF_OBJECT, pobj_StringClass );
+		type.SetType( DEF_OBJECT, pobj_DBClass->GetStringClassPtr() );
 	}
 
Index: BasicCompiler32/NumOpe.cpp
===================================================================
--- BasicCompiler32/NumOpe.cpp	(revision 116)
+++ BasicCompiler32/NumOpe.cpp	(revision 117)
@@ -77,6 +77,5 @@
 	SetStringQuotes( parameter );
 
-	extern const CClass *pobj_StringClass;
-	Operator_New( *pobj_StringClass, "", parameter, Type( DEF_OBJECT, *pobj_StringClass ) );
+	Operator_New( *pobj_DBClass->GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() ) );
 
 	free( parameter );
@@ -719,7 +718,6 @@
 						NewStringObject(term);
 
-						extern const CClass *pobj_StringClass;
 						type_stack[sp]=DEF_OBJECT;
-						index_stack[sp]=(LONG_PTR)pobj_StringClass;
+						index_stack[sp]=(LONG_PTR)pobj_DBClass->GetStringClassPtr();
 						bLiteralCalculation=0;
 
@@ -819,5 +817,5 @@
 						}
 						else{
-							index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClass();
+							index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClassPtr();
 						}