Fix visabiity functionality