Happy new year.
There  is something i do not understand here. Line 391. What you removed, is it not the same as what you added ? Or am i missing something ?