Note to self: fix this selector to something simpler