fixed some errors cause by my previos commit