Issue #1349

Before this change, I mean.