OK, thanks for the reviewing. I'll change order of commits, and add a test about this problem.