Bug fixed !

All the Junit tests pass.