closes #2209