closes #630