closes #1081