Bug fix for AddToolViewController