Minor mistakes from the previous commit are fixed, just for convenience