Fixed the selection process