Fix behaviour for anonymous givers/receivers