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