Fix for pipeline