Fixed a bug on the new tool form