closes #570