Solve issue (11/28)

Solve issue