Fix for GHC 7.4 (for real this time)