Fixing edge case with leading T_NS_SEPARATOR