fix for Issue #844