closes #1284