Changes for ticket #854