Corrected some errors of the previous (rushed) commit