diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.1.6
+
+* Fix Haddock parsing for `FindInMap`. We now run haddock in CircleCI so we
+  shouldn't see a regression like this in the future.
+
 ## 0.1.5
 
 * Added S3 buckets and bucket policies
diff --git a/library/Stratosphere/Values.hs b/library/Stratosphere/Values.hs
--- a/library/Stratosphere/Values.hs
+++ b/library/Stratosphere/Values.hs
@@ -43,12 +43,7 @@
  | Join T.Text [Val a]
  | Select Integer' (Val a)
  | GetAZs (Val a)
- | FindInMap (Val a)
-             -- ^ Map name
-             (Val a)
-             -- ^ Top level key
-             (Val a)
-             -- ^ Second level key
+ | FindInMap (Val a) (Val a) (Val a) -- ^ Map name, top level key, and second level key
 
 deriving instance (Show a) => Show (Val a)
 
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,3 @@
-resolver: nightly-2016-06-30
+resolver: nightly-2016-09-20
 packages:
   - '.'
-extra-deps:
-  - aeson-pretty-0.8.0
diff --git a/stratosphere.cabal b/stratosphere.cabal
--- a/stratosphere.cabal
+++ b/stratosphere.cabal
@@ -3,7 +3,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           stratosphere
-version:        0.1.5
+version:        0.1.6
 synopsis:       EDSL for AWS CloudFormation
 description:    EDSL for AWS CloudFormation
 category:       AWS, Cloud