fixed more crash