Fix for haskell