Bugs. fixing part II