closes #1458