modify some crash issues