Fix card indexing (partially)