Fixed selection issues.