Add fix_raise_six