Partial fix for Issue #84