Fix the visibility fix