Add possible partial fix for #82