fix 3.1.1GA issue