fix another bugs