Fifth commit:bug fixed