closes #1122