Code fix for pipeline