Fixed crash issue