[bcl] Add workaround for csc bug