revised fix for ticket:54