Visibility scope fix