Fixes mapping