fix-2 implemented by tosunvm.
Yet another change.
Merge branch 'master' into ch33-fix2
Merge pull request #2 from tosunvmOrg1/ch33-fix2

Ch33 fix2 merged into master.