closes #1174