Trial fix for ticket:140