solve bugs
bugs