fixed maping bugs