Fixed a rather heinous case of orphan/widow.