diff --git a/src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptTranslator.java b/src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptTranslator.java
index bdf2c0b3..fe73f3c4 100644
--- a/src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptTranslator.java
+++ b/src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptTranslator.java
@@ -848,7 +848,7 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
 				}
 				continue;
 			}
-			if (def instanceof JCVariableDecl) {
+			if (def instanceof JCVariableDecl && !(getScope().sharedMode && ((JCVariableDecl) def).getModifiers().getFlags().contains(Modifier.STATIC))) {
 				if (getScope().enumScope) {
 					print(", ");
 				} else {
@@ -966,6 +966,9 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
 						println().println().printIndent().print("export namespace ").print(classdecl.getSimpleName().toString()).print(" {").startIndent();
 					}
 					println().println().printIndent().print(def);
+					if (def instanceof JCVariableDecl) {
+						print(";");
+					}
 				}
 			}
 			if (nameSpace) {
diff --git a/src/test/java/org/jsweet/test/transpiler/AbstractTest.java b/src/test/java/org/jsweet/test/transpiler/AbstractTest.java
index 9a0ab206..d340c8aa 100644
--- a/src/test/java/org/jsweet/test/transpiler/AbstractTest.java
+++ b/src/test/java/org/jsweet/test/transpiler/AbstractTest.java
@@ -100,6 +100,7 @@ public class AbstractTest {
 			transpiler = new JSweetTranspiler(outDir, null, new File(JSweetTranspiler.TMP_WORKING_DIR_NAME + "/candies/js"),
 					System.getProperty("java.class.path"));
 			transpiler.setModuleKind(ModuleKind.none);
+			transpiler.setPreserveSourceLineNumbers(true);
 			FileUtils.deleteQuietly(transpiler.getWorkingDirectory());
 			transpiler.getCandiesProcessor().touch();
 			testSuiteInitialized = true;