Correcting mistakes of the previous commit