small modification to avoid pipeline to be out of sync with software