closes #1194