diff --git a/mssql-simple.cabal b/mssql-simple.cabal
--- a/mssql-simple.cabal
+++ b/mssql-simple.cabal
@@ -1,13 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.1.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 224e204ca93f3a6226da8b17ae3ed62607288d7c8c6a538f9b7a67a87624fb07
 
 name:           mssql-simple
-version:        0.6.0.3
+version:        0.6.0.4
 synopsis:       SQL Server client library implemented in Haskell
 description:    Please see the README on GitHub at <https://github.com/mitsuji/mssql-simple#readme>
 category:       Database
@@ -28,6 +26,18 @@
   location: https://github.com/mitsuji/mssql-simple
 
 library
+  exposed-modules:
+      Database.MSSQLServer.Connection
+      Database.MSSQLServer.Query
+      Database.MSSQLServer.Query.Only
+      Database.MSSQLServer.Query.ResultSet
+      Database.MSSQLServer.Query.Row
+      Database.MSSQLServer.Query.RpcQuerySet
+      Database.MSSQLServer.Query.RpcResponseSet
+      Database.MSSQLServer.Query.Template
+      Database.MSSQLServer.Query.TokenStreamParser
+  other-modules:
+      Paths_mssql_simple
   hs-source-dirs:
       src
   build-depends:
@@ -43,23 +53,13 @@
     , time
     , tls
     , uuid-types
-  exposed-modules:
-      Database.MSSQLServer.Connection
-      Database.MSSQLServer.Query
-      Database.MSSQLServer.Query.Only
-      Database.MSSQLServer.Query.ResultSet
-      Database.MSSQLServer.Query.Row
-      Database.MSSQLServer.Query.RpcQuerySet
-      Database.MSSQLServer.Query.RpcResponseSet
-      Database.MSSQLServer.Query.Template
-      Database.MSSQLServer.Query.TokenStreamParser
-  other-modules:
-      Paths_mssql_simple
   default-language: Haskell2010
 
 test-suite tds-test
   type: exitcode-stdio-1.0
   main-is: Spec.hs
+  other-modules:
+      Paths_mssql_simple
   hs-source-dirs:
       test
   ghc-options: -threaded -rtsopts -with-rtsopts=-N
@@ -77,6 +77,4 @@
     , time
     , tls
     , uuid-types
-  other-modules:
-      Paths_mssql_simple
   default-language: Haskell2010
diff --git a/src/Database/MSSQLServer/Query/Template.hs b/src/Database/MSSQLServer/Query/Template.hs
--- a/src/Database/MSSQLServer/Query/Template.hs
+++ b/src/Database/MSSQLServer/Query/Template.hs
@@ -287,7 +287,11 @@
   [FunD (mkName "toRpcRequest")
    [Clause
     [TupP
-     (map (\i->ConP (mkName "RpcQuery") [VarP (mkName $ "a" <> show i),VarP (mkName $ "b" <> show i)]) [1..n])
+     (map (\i->ConP (mkName "RpcQuery")
+#if MIN_VERSION_template_haskell(2,18,0)
+                    []
+#endif
+                    [VarP (mkName $ "a" <> show i),VarP (mkName $ "b" <> show i)]) [1..n])
     ]
     (NormalB (AppE
                (ConE (mkName "RpcRequest"))