closes #1264