v3.2.7 fix