bugfix: Issue #32