x86 patch at 12/26

Signed-off-by: Min Le <lemin9538@gmail.com>