Removd bad mapping