Button Visibility Bugfix. RC2