Fixing Issue #81 in 3.2 branches.