fixes #805

If issue #805 have be resolved nicely, just close this PR, thx.