Bring static pointers back to the static table

Bring static pointers back to the static table #60