[FIX] Remove static table reference

Fixes #1928 once merged.