Fix #7618 - Distance Matrix entries are only calculated for the first feature
better variable names