*really* fix tool id mismatch