Ok, I take your advice...
New commit with this changes