yet another cardview fix
merge