Issue #74. Fixed Pipeline related logic.