fixed issue #491