closes #1389