CardSystem bagfix