bugfix from Issue #76