I don't think this is correct. It loses the subtype filtering.