issue 230: fix25,#26