Hotfix - Allow table override.