Fix for old (and new) GHCs