Solve issue (27/28)

Solve issue