Fix cards #1565 and #1630 because they are correlated