closes #1100, closes #1103