Fixed the problems with the previous commits