pre 7.8 fix