Fixed more error in selection