closes #1268