issue #606 fixed