Resolve this issue (12/24)

Resolve this issue