this should have been done by the selector itself already, no?