Made sure files without groups are handled as well