Fixing small issue related to the rebase of the refactoring