Yeah, I was gonna put a TODO for that.

Done, though!