bugfix: Issue #60