Fix for CB 1.6.4-R2.1-SNAPSHOT