Bugfix issue #57 (closes again #57)