REF: Fix subsetter