Dominic: remove unwanted recursion