Adopt the same fix used in the commit 29d73dc to HSW