fixed bug related to button click handler setup