fixed issues to task1(2nd time)