refactoring
refactoring
take :join-nils into account in :group