fix bug part 1