FIX: workaround for cda circular dependency