Hopefully fixed, with the assistance of a second pair of eyes.