Adding fix to have same behaviour for cards