86817fc Added visibility check