update more possible crash bugs