COMMONS-333: Avoid to call the task twice