I have built ModeShape master and our project. I can now confirm that the fix work.
Grate work and thank you Randall