Fixes visibility issues