closes #643