Fourth commit:bug fixed