[TASK] Fix of last commit