closes #1229