closes #1028