closes #1390