diff --git a/package-lock.json b/package-lock.json
index 4c5080f..f015de6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "protoc-gen-elm",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "protoc-gen-elm",
-      "version": "3.3.3",
+      "version": "3.3.4",
       "license": "BSD-3-Clause",
       "bin": {
         "protoc-gen-elm": "index.js"
diff --git a/package.json b/package.json
index d665bdc..ad9ea8e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protoc-gen-elm",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "description": "Elm protoc plugin",
   "keywords": [
     "elm",
diff --git a/src/Generator.elm b/src/Generator.elm
index c04c4cd..9e56abd 100644
--- a/src/Generator.elm
+++ b/src/Generator.elm
@@ -97,7 +97,7 @@ convert versions options fileNames descriptors =
                 declarations =
                     removeDuplicateDeclarations
                         (List.concatMap (Enum.toAST options) struct.enums
-                            ++ List.concatMap (Message.toAST options moduleName) struct.messages
+                            ++ List.concatMap (Message.toAST options) struct.messages
                             ++ List.concatMap (OneOf.toAST options) struct.oneOfs
                         )
 
diff --git a/src/Generator/Message.elm b/src/Generator/Message.elm
index d6b56e7..c905a11 100644
--- a/src/Generator/Message.elm
+++ b/src/Generator/Message.elm
@@ -124,8 +124,8 @@ reexportAST options internalsModule moduleName msg =
            )
 
 
-toAST : Options -> C.ModuleName -> Message -> List C.Declaration
-toAST options moduleName msg =
+toAST : Options -> Message -> List C.Declaration
+toAST options msg =
     let
         type_ : C.Declaration
         type_ =
@@ -160,7 +160,7 @@ toAST options moduleName msg =
                   else
                     C.varPattern "value"
                 ]
-                (if moduleName == [ "Proto", "Google", "Protobuf" ] && msg.dataType == "Timestamp" then
+                (if msg.dataType == "Proto__Google__Protobuf__Timestamp" then
                     -- Use custom JSON encoder for timestamp
                     C.apply [ C.fqFun [ "Protobuf", "Utils", "Timestamp" ] "timestampJsonEncoder", C.val "value" ]