fixed issue #471