fixed issue #605