Bugfix: Button click issue