Solve issue (7/28)

Solve issue