Fix for upstream issue #85