fix_3_0_issue.diff
