1.7 fix