#143 fixed endpoints occuring multiple times in endpoint selection