Resolve this issue (6/24)

Resolve this issue