ed_mann's fix for ticket #322