fix 25 and 26
Merge branch 'master' of https://github.com/gsvgit/142_13_1