Fixed a problem with the last commit
Fixed some problems with the last commit