bug fix part 1