Fixed tool widget instantiation