Fix errors intruce by my last commit