closes #1385