add regex group
fix package duplicate