closes #1221

closes #1221