This should fix the vis switching