A minor change

A lot of work went into this, I *really* need you to pull this into master.