make sure disabled attr removed in all cases