fix another bugs2