Fix for cards