modify to support 4.1.*