Button click bugfix