Bugs. fixing part 1