fixing click-handler