closes #737