Resolve this issue (10/24)

Resolve this issue