[DEV] Fix selection bug