Possible fix for ticket #234