Hotfix for TabOps