Fixed _constructTool to fill pipe in all cases