Port fix for bug #419 from branch_1_1