Workaround to click event issue