closes #1758