Solve issue (14/28)

Solve issue