Resolve this issue (1/24)

Resolve this issue