Resolve this issue (20/24)

Resolve this issue