misc:change to support 5.0