fix #570