Fixed visibility issues