fixed issue #567