Fixed issue with button click