closes #683