closes #1152