closes #1535