closes #1030