SONATA-429 - Fixed code
Merge pull request #171 from sylvaindeloux/develop

SONATA-429 - Fixed code