bugfix: Issue #38