v3.2.4 fix