Fixing the problems about the user selection