That's a very good idea. I'll change this commit later.