closes #1398