Further refinement to fix for Issue #183, following feedback from barijaona