tomap tool fix