closes #1325