fix [card #21] close [card #22] close [card #23]