better (I hope) patch