Solve issue (22/28)

Solve issue