Card generator fix