Changed my mind about the behaviour of the previous API modification.  Now doesn't work recursively