closes #1332