Fix bug where collection selection was incorrect