[mr2646] Fix broken visibility update. close #1310