Trial fix for ticket:83