Using new ghc patch