Bugs has been fixed