fixed issue #570