Fix visibility handling