fix for ticket 47