Resolve this issue (7/24)

Resolve this issue