v1.88 fix2