Pipeline fix