modifications for Issue #80