WBS: performance tweak