Fix for an Issue #85