closes #1156