Attempt to fix issue with selection.

Change-Id: Ie4a613137d89564a9c91c900d0947bdc8e199b64