Resolve this issue (18/24)

Resolve this issue