workaround for issue 206 and issue 204
Merge pull request #1 from chenall/master

workaround for issue 206 and issue 204