keep fixing bugs