closes #517