[DEV] Fix selection bug
Merge pull request #1 from niavok/master

[DEV] Fix selection bug