Fixed another crash issue