closes #1397