Fixed issue with selection when updating the model