Fixed selection errors