Fix for current GHC HEAD