Solve issue (17/28)

Solve issue