- fixed issues with last commit