TD-3419 add needspace