Fix for https://jira.talendforge.org/browse/TESB-9929