small hack for improved CA handling