closes #1456