Fix family scenarios