Resolve this issue (2/24)

Resolve this issue