fix for ticket #215