Bugs solving