Apply the same fix in SHA: 61457e1c1b