r1605 fix bug related r1604 and improve fill [ver 1.6.3]