closes #1207

closes #1207