Fixed crash issue for v3.2-