Putting in Diederick Niehorster's patch from e-mail dated 1/23/12 at 6:48 AM to fix...