closes #560