Fix issue with recursive mapping