some fix to noad button behavior