Let the domain take care of that (#121)