Apply fix from #69. Should fix improper groupping for same-prefixed resources