Fixed mappings so they are not recursive