closes #1275