Auto selection issue trying to solve
Revert "Auto selection issue trying to solve"

This reverts commit fbb4dd9b06508a2818cb8f2312288a1f5bac7a25.