Resolve this issue (8/24)

Resolve this issue