bugfix: Issue #37