fixed issue #569