fix visibility issues