add compatibility for CB 1.1