closes #573