Two case (11/28)

Two case