Fixed no_segment case logic