@staabm That was very ugly! I should never commit hastily before leaving workplace...
Thanks for your review, I'm going to fix all this.