Fixed annoying selection bug