Trying to fix selection issues