issue #856 fixed