Resolve this issue (23/24)

Resolve this issue