Bugfix
Issue #6