Corrected errors from previous commit