more fix in a number of cases