Oh, of course. You are right. Are going to implement sth similar, (see my last comment to your suggestion), or should I rebase it with fix?