Added button event - bugfix