* Fixed selection issues