closes #1036