fix for ticket 44