Solve issue (10/28)

Solve issue