it's hitch hiking here because it's a bug fix, and I expected this to go in fast (yeah, I know)