bug fix part 2