closes #1513