fixed problems with last commit