This is why you don't do commits when you're tired. Fixing bugs from 59802928566b6be3...