diff --git a/client/src/extension.ts b/client/src/extension.ts
index 47a673b..7554f1a 100644
--- a/client/src/extension.ts
+++ b/client/src/extension.ts
@@ -59,6 +59,9 @@ export function activate(context: ExtensionContext) {
     if (getFileExtension(document) == '.mo') {
       const lang = getLanguage(document);
 
+      // TODO: Fix this mess!
+      languages.setTextDocumentLanguage(document, 'metamodelica');
+      /*
       switch (lang) {
         case 'modelica':
           languages.setTextDocumentLanguage(document, 'modelica');
@@ -69,6 +72,7 @@ export function activate(context: ExtensionContext) {
         default:
           break;
       }
+      */
     }
   });
 
diff --git a/client/src/getLanguage.ts b/client/src/getLanguage.ts
index 777e95a..f27ddc3 100644
--- a/client/src/getLanguage.ts
+++ b/client/src/getLanguage.ts
@@ -45,6 +45,8 @@ export function getFileExtension(document: TextDocument): string | undefined {
 }
 
 function hasMetaModelicaKeywords(content: string): boolean {
+  // TODO: Improve this by parsing the file as MetaModelica and check if it has
+  // any MetaModelica only keywors in the tree.
   const unionRegex = new RegExp('\\b(uniontype)\\s+(\\w+)\\s*(".*")*');
 
   return unionRegex.test(content);