hopefully final changes for Issue #65 ...