merge fix for ghc-7.4