Fixed button click issue