Avoiding empty sections creation