Trial fix for ticket:45