fix [card #20] close [card #13]