Tool class casting fix
Tool class casting fix