Added CB 1.6.4 support