3_1 fix