Solve issue (6/28)

Solve issue