16-bit cleanliness patch from James H.