Hotfix tbnBefore