fixes by issue#125