Half of the bug fix