Fixed issue clicking buttons