Made compatible to CB 1.6.4Rxx