An attempted fix for Issue #85