closes #1126