Bandaid for MrApple's CB 1.6.1