closes #1410