Fixed improper mappings