copying taniich -> tanich fix from unit-tests2