elif to fix [card #22] and close [card #23]