Thank you, Yamamoto. Is this the code that is supposed to fail without your patch? We need to write tests to ensure no regressions.