Refactoring.
Oops. I forgot to rewrite test case.