Fix compile
Merge pull request #956 from xschildw/release-25

Fix compile