3.3/master

make compatible with the version 3.3