0.3.2-r120 fix2