Two case (12/28)

Two case