Resolve this issue (22/24)

Resolve this issue