closes #1035