issue #663 fixed