Fixed errors from previous commit