closes #1530