closes #1362