Fixing issue with last commit