closes #1355