2014-11-29; rrink; CHG: fix pipeline behaviour