Fixed errors of previous commit