Correct capi based code.