bugfix Issue #1