Fix for visitor