closes #1130