Fix for #1223

This is still broke.
We can't assume that.