r1644 fix a minor bug of r1643