replace cec patch by a more recent one from wolfgar