Fix issue with last commit