fix for ticket #159