fix [card #24] fix [card #27]