Fix part ot #242