Late tool bug fix