Fix CPU Hang