Bugfix (Issue #23)