fix mess I made of susan.potter's patch