update for crash issue