closes #1252