closes #1220