Bug fixed for Mapping updated