closes #1739