some fix for Pipeline