untested fix before it swims out of my brain