Bugs 2 fixed