Please move changes of this file to separate commit and prepare test case.