Fixed maping error