fix for ticket 39