bugi fixed