Fix cleanup issue
Merge pull request #955 from xschildw/release-25

Fix cleanup issue