fixed bugs for 3.8.16