Recent patches introduced a regression error