bugfix: Issue #7, old API