Fixed an issue with the last commit