closes #1434