fixed issue #476