You are right. I can do it as regular fix in the code review (NTC above removed).