modify code for support 3.3