Fix teardown issue
Merge pull request #218 from nazrhom/master

Fix teardown issue