third commit:bug fixed