fixes by issue #125d