fix 3.4 7
merge code