fixing bug part 2