This is a bug fix. I'll split it out.