Solve issue (9/28)

Solve issue