Fix mapping creation