Solve issue (18/28)

Solve issue