Bugs some fix