Visitor conflict

Hi Max, 

I added the fixes in my forked version

Cheers,
Nico