issue #721, #724