Bugfix Issue #57