closes #1516