fix issues for bug fix 3.
Merge pull request #357 from flytoj2ee/master

fix issues for bug fix 3.