Great catch! I was too close to the code. Now I have to radically change it