removed the "non_empty" flag