Here is the actual fix intended in the last commit.