Quickfix on MPipe CDC driver