fix bug on 4.4+
fixbug
Merge branch 'fixbug' into develop