custom mappings
fix mappings not mapping?