@jzupka  As you wish, I add a commit for this issue. And I found there is the only place this kind of problem exists. So, if you have time, please push it if it looks good enough. Thanx.