Resolve this issue (13/24)

Resolve this issue