closes #1288