4.7 fix