fixed bug of previous commit