closes #1913