Actually fixed+tested.  coding at OH is dumb