Fix selection for #13716
update changes
Merge pull request #37 from Goldmund-Wyldebeast-Wunderliebe/master

Fix selection for #13716