v3.2.9 fix