diff --git a/Data/ASN1/Prim.hs b/Data/ASN1/Prim.hs
--- a/Data/ASN1/Prim.hs
+++ b/Data/ASN1/Prim.hs
@@ -71,7 +71,7 @@
 
 encodeUCS2BE :: Text -> L.ByteString
 encodeUCS2BE t =
-	L.pack $ concatMap (\c -> let (d,m) = (fromEnum c) `divMod` 256 in [fromIntegral m,fromIntegral d] ) $ T.unpack t
+	L.pack $ concatMap (\c -> let (d,m) = (fromEnum c) `divMod` 256 in [fromIntegral d,fromIntegral m] ) $ T.unpack t
 
 decodeUCS2BE :: L.ByteString -> Text
 decodeUCS2BE lbs = T.pack $ loop lbs
diff --git a/Tests.hs b/Tests.hs
--- a/Tests.hs
+++ b/Tests.hs
@@ -151,6 +151,7 @@
 		, liftM GraphicString arbitrary
 		, liftM VisibleString arbitrary
 		, liftM GeneralString arbitrary
+		, liftM BMPString arbitrary
 		, liftM UniversalString arbitrary
 		]
 
diff --git a/asn1-data.cabal b/asn1-data.cabal
--- a/asn1-data.cabal
+++ b/asn1-data.cabal
@@ -1,5 +1,5 @@
 Name:                asn1-data
-Version:             0.6.1.1
+Version:             0.6.1.2
 Description:
     ASN1 data reader and writer in raw form with supports for high level forms of ASN1 (BER, CER and DER).
     .