Attempt to fix selection bug.