Fix to persistence layer recursion.