closes #1346