fixing ESBJAVA-3303
Merge pull request #123 from miyuru/master

fixing ESBJAVA-3303