Update with pull request, now works with GHC 7.8