Resolve this issue (3/24)

Resolve this issue