Resolve this issue (19/24)

Resolve this issue