more fixing in branch 'one'