Solve issue (26/28)

Solve issue