Updating: fixing lvalue-selection.