Bugs was fixed