Fix issue on 3.4.X review
Merge pull request #256 from jmpascal/MERGING-1

Fix issue on 3.4.X review