fix issue gh-8