bugfix to chooser reordering code

Change-Id: I7234a8395b90d94625472eeb7725a7cd614fd6df