Attempt fix for GHC 7.0, pt. 2