Solve issue (8/28)

Solve issue