Fixed bug with user selection