Fix regression of commit d6f52cf8280c4f740170bf1f93d31de2e0fd162