Resolve this issue (9/24)

Resolve this issue