Some crash fixed