Fixed issue with last commit