[ABM] Fix to last commit, thanks to Maxime who mostly did the changes for the last commit