Made a few mistakes in the previous commit