Fix #570