Fix card bundle handling (not finished)