Be more cautious when preserving visibility