closes #676