Fixed tool usage