Fixed the Button 'click' bug