Fixed user selection bug