CC 1.5 Fix addressing #135