closes #1123