fixing issues with last commit