Visibility bug fix