bug fix for tools