Bug Removed in Mapper