fixing mapping