fix_31_21