Possible fix to visibility state