fixed issue #629