could this check also be part of the selector above?