Another fix to get closer to fixing Issue #97