Solve issue (19/28)

Solve issue