another splitup hotfix attempt