[BUGFIX] Fix to last commit