Fixed for GHC 7.8/base 4.7